non fast-forward merge